gnomeos: Add -x86 tag to builds

Since later we'll want -x86_64 too.

diff --git a/gnomeos/yocto/commit-yocto-build.sh b/gnomeos/yocto/commit-yocto-build.sh
index c53b330e74ed97c8487ad745a154e9279b007506..b3b1786a26847f2b5ab7de654daa6cbc3561889f 100755 (executable)
--- a/gnomeos/yocto/commit-yocto-build.sh
+++ b/gnomeos/yocto/commit-yocto-build.sh
@@ -22,14 +22,18 @@ BRANCH=$1
 test -n "$BRANCH" || usage
 shift
 
+ARCH=x86
+
 OSTREE_REPO=$WORKDIR/repo
-BUILD_TAR=$WORKDIR/tmp-eglibc/deploy/images/gnomeos-contents-$BRANCH-qemux86.tar.gz
+BUILD_TAR=$WORKDIR/tmp-eglibc/deploy/images/gnomeos-contents-$BRANCH-qemu${ARCH}.tar.gz
+
+BUILD_TIME=$(date -r $BUILD_TAR)
 
 tempdir=`mktemp -d tmp-commit-yocto-build.XXXXXXXXXX`
 cd $tempdir
 mkdir fs
 cd fs
 fakeroot -s ../fakeroot.db tar xf $BUILD_TAR
-fakeroot -i ../fakeroot.db ostree --repo=${OSTREE_REPO} commit -s "Build (need ostree git version here)" -b "gnomeos-$BRANCH"
+fakeroot -i ../fakeroot.db ostree --repo=${OSTREE_REPO} commit -s "Build ${BUILD_TIME}" -b "gnomeos-$ARCH-$BRANCH"
 cd "${WORKDIR}"
 rm -rf $tempdir

diff --git a/gnomeos/yocto/gnomeos-run.sh b/gnomeos/yocto/gnomeos-run.sh
index dae28f9f84643196053759c1f8d8f6dc4fcc2009..f3e6e5421151c765ce7f3c68fdd03f4eb5760293 100755 (executable)
--- a/gnomeos/yocto/gnomeos-run.sh
+++ b/gnomeos/yocto/gnomeos-run.sh
@@ -41,6 +41,10 @@ OSTREE_REPO=$1
 shift
 test -n "$OSTREE_REPO" || usage
 
+ARCH=x86
+
+BRANCH="gnomeos-${ARCH}-base"
+
 OBJ=gnomeos-fs.img
 if (! test -f ${OBJ}); then
     rm -f ${OBJ}.tmp
@@ -65,9 +69,9 @@ if (! test -f ${OBJ}); then
     mkdir repo
     ostree --repo=repo init
     ostree --repo=${OSTREE_REPO} local-clone repo
-    rev=$(ostree --repo=repo rev-parse gnomeos-base);
-    ostree --repo=repo checkout ${rev} gnomeos-base-${rev}
-    ln -s gnomeos-base-${rev} current
+    rev=$(ostree --repo=repo rev-parse ${BRANCH});
+    ostree --repo=repo checkout ${rev} ${BRANCH}-${rev}
+    ln -s ${BRANCH}-${rev} current
     cd ..
 
     mkdir proc # needed for ostree-init